Skip to content

Show the same readiness for approved PRs on Reviews and Team - #737

Merged
apollos-medic[bot] merged 2 commits into
mainfrom
medic/apo-17965-approved-readiness
Nov 18, 2026
Merged

apollos-medic[bot] merged 2 commits into
mainfrom
medic/apo-17965-approved-readiness

Conversation

@apollos-medic

@apollos-medic apollos-medic Bot commented Nov 18, 2026

Copy link
Copy Markdown
Contributor

Closes APO-17965

On Reviews with "Include approved", approved PRs showed the raw CI state (for example "none") because approved rows have no blocker reason. Team's "Approved but unmerged" list uses mergeBlocker(), so the same PR showed "Conflicts" there.

Reviews now uses mergeBlocker() for approved rows, so both pages show the same readiness (Stacked, Conflicts, CI failing, CI running, No CI status, Awaiting merge). Other sections are unchanged.

Testing: tsc --noEmit, eslint and npm test pass locally. Added a check to tests/reviews.e2e.ts that the fixture's approved, conflicting "Login link expiry" shows "Conflicts" on Reviews.

@apollos-medic
apollos-medic Bot requested a review from redreceipt as a code owner November 18, 2026 08:38
@vercel

vercel Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
bug-board Ready Ready Preview Nov 18, 2026 5:04pm UTC

Request Review

@linear-code

linear-code Bot commented Nov 18, 2026

Copy link
Copy Markdown

APO-17965

@apollos-medic

apollos-medic Bot commented Nov 18, 2026

Copy link
Copy Markdown
Contributor Author

validate fails only at npm audit --omit=dev, on the high picomatch advisory GHSA-fc5q-39xc-vjpf (via eslint-config-next → tinyglobby). main has failed the same step since its 3:55 PM ET push on Nov 17, and no patched picomatch exists yet, so this isn't from this change. check and npm test passed in CI, and tests/reviews.e2e.ts passes locally with E2E_FIXTURES=1 against a production build. I'll request reviewers once validate is green.

@redreceipt redreceipt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is failing. Please fix it and re-request my review.

@apollos-medic

apollos-medic Bot commented Nov 18, 2026

Copy link
Copy Markdown
Contributor Author

@redreceipt I can't fix this one inside this PR. The only failing step is npm audit --omit=dev, and it fails the same way on main (since #733's run on Nov 17) and on #736.

The cause is picomatch GHSA-fc5q-39xc-vjpf (high, ReDoS). Every published picomatch is affected (<= 4.0.7, no patched release), and it comes in through a production dependency: workflow@5.4.0 → @workflow/cli → tinyglobby → picomatch@4.0.7. So an override or bump can't clear it yet. Upstream fix PRs were opened in the last few hours (micromatch/picomatch#268–#273), none merged or released.

Two ways to get green:

  1. Wait for the picomatch release, then a lockfile bump (or overrides) clears it for every PR.
  2. Let CI pass this one advisory for now (for example an allowlist for GHSA-fc5q-39xc-vjpf in the audit step) in a separate small PR, removed once upstream ships.

That's a CI policy call, so I'll leave the audit step alone unless you want option 2. I'll re-request your review as soon as validate is green.

@apollos-medic

apollos-medic Bot commented Nov 18, 2026

Copy link
Copy Markdown
Contributor Author

The picomatch audit failure is addressed in #743 by moving workflow to devDependencies.

@github-actions

github-actions Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

🟢 e2e: 1 passed

All 1 test in 1 file
Test Time
🟢 tests/reviews.e2e.ts · 1 passed 1.6s
🟢 review queue keeps blocked pull requests out of ready 1.6s

Tested by e2e 0.23.0 · 3.4s · web · run artifacts

@mary-pr-poppins

Copy link
Copy Markdown

Please add screenshots to the PR description before requesting a review.

@redreceipt

Copy link
Copy Markdown
Member

@codex review this

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-18T18:02:26.677674Z b991263 Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit: b9912631cb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@apollos-medic
apollos-medic Bot merged commit a7a6cc2 into main Nov 18, 2026
4 checks passed
@apollos-medic
apollos-medic Bot deleted the medic/apo-17965-approved-readiness branch November 18, 2026 18:59

This branch was successfully deployed

1 active deployment
Preview — b9912631 Deployed Nov 18, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants